Repository navigation
sync: merge SFTtech/openage master - #2
Merged
Merged
Conversation
Since Python fslike paths are stored as str, the C++ callbacks still passed subpaths as bytes and read Directory.path and native paths with bytes(). Lookups in a Union never matched, so the engine could not find assets/converted and the game did not start. Let Cython convert std::string to and from str (UTF-8) in the fslike bridge, and read Python strings with str() in C++. Co-Authored-By: Claude Opus 5.5 <[email protected]>
The presenter attaches its renderer in its own thread, which can happen before GameSimulation::start() has created the game, because creating it loads all nyan data. That dereferenced a null game and crashed. Store the render factory and attach it to the game in start() if the game didn't exist yet. Co-Authored-By: Claude Opus 5.5 <[email protected]>
Co-Authored-By: Claude Opus 5.5 <[email protected]>
Fix game startup: fslike str paths across C++/Python and renderer attach race
The Grid constructor taking existing sectors moved the vector into the member and then read the sector size from the moved-from parameter, so it always threw std::out_of_range. Fixes SFTtech#1828 Co-Authored-By: Claude Opus 5.5 <[email protected]>
pop() locked the recursive mutex and then waited in front(), which locked it a second time. The wait only releases one lock level, so the mutex stayed held, push() could never add an element and pop() on an empty queue deadlocked. pop() now waits itself, holding only one lock. Fixes SFTtech#1826 Co-Authored-By: Claude Opus 5.5 <[email protected]>
…sectors pathfinding: read sector size from the moved sectors in Grid
…t-queue-pop datastructure: let ConcurrentQueue::pop() wait with a single lock
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Automated sync with upstream SFTtech/openage master.